commit ce9795954d3957e98d24bf711869efd846df6f15
author Caolán McNamara <caolanm@redhat.com> Tue Jun 18 14:04:27 2019 +0100
committer Caolán McNamara <caolanm@redhat.com> Tue Jun 18 17:51:52 2019 +0200
tree 964c566365b4675f3ecf5d1bd31381ee389e35dc
parent d56be0923966deab3f49bc460a5d233d1301430f

fix crash in header/footer calc dialog

cut and paste can happen when the EditView isn't in a vcl::Window

Change-Id: I9fdbfe28c5ca5dd680b821ff8ce4e0133ab203aa
Reviewed-on: https://gerrit.libreoffice.org/74280
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

editeng/source/editeng/impedit.cxx

diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 0fa84e2..9618c1f 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -28,6 +28,7 @@
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
#include <com/sun/star/datatransfer/clipboard/SystemClipboard.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
#include <editeng/flditem.hxx>
@@ -38,8 +39,9 @@
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <comphelper/string.hxx>
#include <comphelper/lok.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
#include <sfx2/lokhelper.hxx>

using namespace ::com::sun::star;
@@ -1268,6 +1270,13 @@
    return Pair( nRealDiffX, nRealDiffY );
}

Reference<css::datatransfer::clipboard::XClipboard> ImpEditView::GetClipboard()
{
    if (vcl::Window* pWindow = GetWindow())
        return pWindow->GetClipboard();
    return css::datatransfer::clipboard::SystemClipboard::create(comphelper::getProcessComponentContext());
}

bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window const * pFrameWin )
{
    bool bDone = false;
@@ -1281,7 +1290,7 @@
            {
                if ( !bReadOnly )
                {
                    Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard());
                    Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetClipboard());
                    CutCopy( aClipBoard, true );
                    bDone = true;
                }
@@ -1289,7 +1298,7 @@
            break;
            case KeyFuncType::COPY:
            {
                Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard());
                Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetClipboard());
                CutCopy( aClipBoard, false );
                bDone = true;
            }
@@ -1299,7 +1308,7 @@
                if ( !bReadOnly && IsPasteEnabled() )
                {
                    pEditEngine->pImpEditEngine->UndoActionStart( EDITUNDO_PASTE );
                    Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard());
                    Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetClipboard());
                    Paste( aClipBoard, pEditEngine->pImpEditEngine->GetStatus().AllowPasteSpecial() );
                    pEditEngine->pImpEditEngine->UndoActionEnd();
                    bDone = true;
@@ -1329,12 +1338,12 @@
        if ( rMouseEvent.IsMiddle() && !bReadOnly &&
             ( pWindow->GetSettings().GetMouseSettings().GetMiddleButtonAction() == MouseMiddleButtonAction::PasteSelection ) )
        {
            Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(pWindow->GetPrimarySelection());
            Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetClipboard());
            Paste( aClipBoard );
        }
        else if ( rMouseEvent.IsLeft() && GetEditSelection().HasRange() )
        {
            Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(pWindow->GetPrimarySelection());
            Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetClipboard());
            CutCopy( aClipBoard, false );
        }
    }

editeng/source/editeng/impedit.hxx

diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 8f09ca8..b7f7d5d 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -282,6 +282,8 @@

    void InvalidateAtWindow(const tools::Rectangle& rRect);

    css::uno::Reference<css::datatransfer::clipboard::XClipboard> GetClipboard();

protected:

    // DragAndDropClient